Expectations refactoring and fixes
Tests speedup