with() update operator
Regex to match more possible class names
Refactor TestEntity into ChildEntity
Fix Marshaller to make test pass