refinements to tests