test refinement, code fix