Updated the newly added tests to use the Hamcrest framework.