Updated tests and docs, temporary fix for #439751

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