Rewritten tests from scratch

Signed-off-by: makulik <g-makulik@t-online.de>