Some slight reformatting, also added test how attribute values should be transformed for files and labels
Resolve conflict