Add further tests and admin protection to self-delete