Merge "Move semaphore tests to their own class" into feature/zuulv3