Add some additional unit tests and change error status to null from NONE. Some minor serializer cleanup