more test fixes and gson serializer fixes