Refactor pending waiters
Continue rafactoring
Add disabled test