Fixed some unit tests that were failing against server 2.5.2.