Added models and tests for waits.