pass test_delete
pass test_should_not_allow_self_revoking and fix other broken tests
auto merge