Continue to refine TESTING