Refactored tests structure