Fix tests
Merge test fixes from master