helpers: make them compatible with the documentation
test: add some more tests