Change the assertions to the hamcrest system