Model tests now pass

No longer embarassing