Consistently import `org.hamcrest.MatcherAssert.assertThat` instead of
JUnit's `assertThat`.

Also replace `equalTo(asList())` with `contains()`.