Fixing test cases. Only 2 continue to fail.