Fixed null value implementation and tests