Fixed broken test cases.
Merge branch 'test_cases' into develop