Revert "fixed some whitespace issues"

This reverts commit ca4a8d26eccc535f37b8cadb7e9a0a0105977067.
Added a variation of version 5 with a setUp method instead of returning values