Merge "Remove test for Active on Delete"