Refactored server based tests
Fixed name of tests