Fixes to tests