[Issue 615] Updated QueryForSubtypeTest to use assertThat, and simplified the tests, although they do the same things.