Added functionality for JUnit tests.  Still need to implement some tests