simplified deployment
fixed tests for new data model