Revert "Some more check expects"

This reverts commit 4a993222330cff19c007f0ebe39c334dac096008.