CXX-141 Improvements to insert_demo