COMP: Finish debugging, now passes test