test fix, refinements