Fix footer counter not being reset, _test updates