Refactored, refactored tests