commit mocking/stubbing in test before I obliterate it for now
Added support for setting fields to null