Improved the handling of the 'single instance' unit test option, however, a couple of tests are still failing: testStartSessionShouldHaveSessionId and testUntilShouldWaitShouldThrowException