more fixes to tests