Test fixes and a few cascade-delete additions