Fixed user migration, now adding testing
Merge branch 'editingmodel'