more refactored tests