moving Application class
integ test refactoring