Working on exhaustive test of component/entity/query code