Added test for cleanupValues