Some cleanup in the semaphore tests
Added missing testing annotations
Merge pull request #2141 from pveentjer/semaphore-test-cleanup

Some cleanup in the semaphore tests