Null and list handling

Various changes/fixes that arose while setting up a test scenario directly using model-objects (no DB)