Don't save the entry for a new item
Test fixes