fixed comments from code review. Also, added @RunWith(JUnit4.class) to
test class.