more test fixes and gson serializer fixes extended the mockfactories datacreation to hold two tools and three features