Revert tests that started failing after 49ae6b4030e83a9e0b5a842810c7ddda3c322b24