don't spawn test servers if not needed
Merge pull request #284 from burns/refactor_tests

don't spawn test servers if not needed