Make only the matching and removal of expectations synchronized, rather than covering the delay period too