updated model to allow nulls in some data fields

also updated tests to handle moving data