More models updated and more tests to prove it