Merge "Move test_waiters to match directory structure"