Updating api server and push server tests to new way