Rewritten to follow the latest spec

Adjusted expectations.
Merge pull request #594 from KenjiBaheux/updated-test-athost

Rewritten to follow the latest spec