Added a couple of new tests, and reorganised tests
Unit tests now use Hamcrest