Updated docs and test cases

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