Remove todo
Use hamcrest in a test