clean up test names
add data model