Fix to unidirectional delete bug + test fixes.