Merge "Testing if the test failing is because of an incorrect state" into main