Rewritten to follow the latest spec

Adjusted expectations.