JUnit tests added, App class reformatted