Cleanup

*Cleaning up the JUnit tests
*Working on changing Points of Interest to use a single Region instead
of a LinkedHashMap for location.