improving tests according to Dominic's notes
fixing line endings