EntityType.getSimpleType: incorporate review comments

- Also converts EntityTypeTest from groovy to java