made changes based on review and added @RunWith(JUnit4.class) to the
test class.