FIX: Make testing slightly cleaner

This does not fix the problems in `master`, but it should make them easier to diagnose. Ready for review/merge from my end. 
Ummmm.. for some reason I thought it had only been removed from one function.
Apologies for noise.