more tests refinement