new tests, more model functionality