Fixes to other tests