Fixing some of mike's tests
Fixing merge conflict