Doco for expectations
Add test for expectations
Merge branch 'test-expectations'