Small coding style fixes
Cleanup includes
Added test for UnPickle::toJson returning an object for the BattleSetup pickle