Updated test cases and test case runners