refactored tests structure