refactored old tests to work with new models. this resolves #73.