more test fixes. all model tests pass for me now