Rewrote using avaiables helpers

I used, for my mistake, some helpers that are not available in old documentation examples.
This PR will fix them and make tests pass for Apiary product.