Fix tests to work with new adpater stuff
Merge branch 'master' of github.com:mde/model