Fixed adding existing entry & adding respective tests