Cleaned up datamodel regression tests a bit more. Removed all precond targets