Fix matcher method not working with raw enum name
Write unit tests for added methods
Correct typo in ocelot name in EntityType.java (non-breaking)