updates and fixes for test_cases