For now I split base.Entity tests from marshaller tests. Let's get all tests passing first and then do the refactoring.