Fixed test wiring to work with v2, some enum and GSON fixes.