Merge "Change checks for test_server test"