fixes to tests