Refine TEST-USABILITY