clean up spec and wait_until