Test suite improvements w/app.php refactoring.