add stop operations and tests