improved test structure, causes build fixed

Signed-off-by: Alexander Book <redchrome@gmx.de>