Updated service to use mocha, merged w/ views