Cleanup and more testing on inserts