improved stack again
improve performnce by avoiding waitFor when expectation don't need to wait for promises