Don't conflict with test methods.
Refactor JSON unmarshalling bits.