Minor testfixes