Moved filed from Java to Junit Groovy
Changed tests to use hamcrest matching