Kills ApiTestBase && refactors