Whitespace fixes
Change unit tests into specs
Merge branch 'tidy-whitespace'