model-ify items in level and add new test from forgotten code