Update spec to take in account null fields in context model