corrected uppass and associated testing