Add cancel test & fix some tests