adding updated tests and models