Continued work on JUnit tests

Working on location class testing