Unit test fixes due to server changes