basic data model updated
more test codes