modified models, updated unit and functional test to pass