Update test stuff to deal with hamcrest whackiness.