Add missing before_delete and after_delete parameter
Fix incorrect PTR instantiation in tests; remove useless stuff
Fix more incorrect PTR instantiation
Fix style, spelling, and grammar