Fixed tests for 2.8 server