Didn't test well enough, broke reset. Fix for reset... oops. Looking into enhancing tests