Added waitForMore() and tests for waitFor() and waitForMore()