Updated some tests to use hamcrest for better readability