minor fixes to tests