Fix tests / warnings in tests on my mac
Clean up TODO files
Whitespace tidys