More testing, fix insert