Converted test to JUnit test. Added hamcrest matchers