removing systemid references
fixing test
improving handling of uuid.UUID objects in json
more test fixes