Test Cases Fixes and more refinements