Adds type to attributes in the admin interface, fixes test data