Yet more testfixes