Added another server test, fixed old test.
Renamed test files.