Visual improvements
Woops, forgot test rename...
Merge pull request #303 from boersmamarcel/small_fixes

Visual improvements