Added tests for new expectations