Fixing test cases
Simplifying