fixes to some tests