Test cleanup

I will let this PR until monday evening.
If there is nothing to say, let me know however.