Updated tests to take advantage of new test service manager