Add test for Stop returning only after save finishes