Improved delete on clsoe test, style fixes