Test simple move - refactor reset server for tests