Add delete tests plus do some clean up