master: Cleanup on aisle BaseTest