various testfixes