enabled test for deleteValues and minor cleanups