Merge "Remove uncalled test code" into feature/zuulv3