Update gems; minor model code updates; start fixing tests