Refactored test paths