Fixed tests due to changes in the server API