Fix tests to pass with recent GAE SDK versions