Added get_waits and tests.