fixed/extended test_zetup