Making tests clean-ish

Hey there, another big change.. According to Uncle Bob, tests must be clean.. So I helped a bit with that.. No functionality changes, but less code.. Enjoy