Fixed some small stuff. Commented some tests that has not yet been
implemented by the server in ServerMassTestClass