Revert "Revert "Revert "Temporary removal of some test cases"""

This reverts commit 78521d88571d003b4a3260ce0e47029079887f29.