Test classes added, more robust refinement