Removing the target type from schema and test data