Refactored test methods