Updated tests and config
Merged old App package into MVC