fixed values on null not null, fixed update test