Added hamcrest, junit and test