Testing - adjust tests to allow us to deploy.

API-level tests are currently disabled.