Revamped reset feature. Tweaked tests accordingly.