Merge branch 'test-expectations'