Changed all test cases to use the basic hamcrest matchers.