Fix tests by waiting a frame and ignoring stage