Revert "Temporary removal of some test cases"

This reverts commit 2d5a5891b9ee17e527243f66fe5b23a6a3e96ca8.