Delete test is implemented. Fix delete procedures.