Towards test fixes
All tests passing