Test cases updated

Test cases and models updated.