Added Expectancy and tests