more cleanup; commenting out plotting calls in test methods