Safer post-merge; Ensure tests pass before commit