Insert tweak and more testing