Cleanups and tests for @JsonDeserializer