Add tests for cancellation and move removal of sub to its service