Updated service to use mocha, merged w/ views
Merge branch 'feature/53320595/data_storage' into develop