Fixed insert return type and tweaked some tests