Refactored API tests before adding simplified routes to support new onboarding