Merge pull request #1582 from dnsunderland/parameterless

Introduce parameterless expectations