Fixed broken test cases and removed old testcases.
Merge branch 'fix_testases' into develop