Refactor; added cancel tests