More work on tests and marshalling
Normalize line endings