Tag all doctest tests
Do not consider handler swap to be failures
Remove deprecated branches