Add a TODO to use Hamcrest.