created slightly simpler interface to the models
fixed up the tests i broke