Fixed datamodel commit. Added more tests.