Added UnitTest for Manager, restructured App to be correct for unit testing