Added unit tests for the whole change also por parsing/serializing nulls