Whitespace cleanup

Use spaces for indentation. Better test scenario names.
More TODOs