Refactored test directory