Updated tests and defaults on models