Fixes for diff
Committing before merging for updating test cases