updating some white space issues
added another test to AppTest.java
made another test within AppTest.java
added both tests during the merge