Refactoring tests. They make more sense now :P