Moving some test files
More test refactoring, global before/after to start/stop test server