re-include all test cases which I accidentally removed.