Add delete tests

Change-Id: I8c574cf1a6c6ad809349a378c2782f80a00a0f50