Updated tests and models