Add System test to test suite
Refactor connection semaphore