more testfixes