Added tests to make sure that the in flight attributes get cleared.
Tests to ensure that after failed, then successful save, everything is as it should be.