Fix tests to new testbed and datamodel