Refactored tests. They got too big for one file