Merge "Revert "Verifying that workspace looks correct at the end of the test."" into main