remove countdown, update tests