- step by step, driven by missing functionality of the basic unit tests

Signed-off-by: Stefan Marr <git@stefan-marr.de>