updated my tests"
merge of activity.js and model.js