Bug Fixes for old test cases