Updated tests and docs

Signed-off-by: Jochen Hiller <jo.hiller@googlemail.com>