Fix new tests and hamcrest dependencies