Integration test fixed.

Fixed an integration test that was failing due to
@JsonProperty now allowing inclusion in JSON.

Also removed some commented out cruft I missed.