some finetuning
made autotest work again