updated tests and models