Adding Cascade DELETE and tests