Remove newlines
Reorder contents of Connections
Improve date constants in tests