Fixed single element insertion and tests