More testing improvements, cleanup object cancellation.