some more fixes to tests