Added some JUnit testing, we still need to do unit testing for the query handlers