Adding server startup/teardown to tests
Merging and refining