add hamcrest dep
improve tests - add assertions to each