Implement more screen management with tests