Start merging old and new
Add tests for old/new assumptions mixing