Refactoring my tests again are we? ;)