Fixed some failing ee test cases. Still have fix the COW tests.