Remove dead imports
Fix order of providers in generated test apps