Testing improvements
Fix conflicts and merge.