Refactored tests (again)