Updated model tests with number calculation tests.