models tests updated; all passing

Ready to merge!