Add datamodel test
More legacy test cleanup