Fix indention and tests

I forgot to update the tests after the last rebase for the previous pull request, this fixes that.

I set the indention every where now to 4 spaces per level.
Added for VIM: # vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: