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

This reverts commit a0517c4008f5cd9f5af2fef7794573adfed73727.