fix package.json

sort the dependencies
cleaning up

fix server service test

remaining failing test...I don't know.  skipping for now.  function is
fine, just the data I'm getting from the db is strange to me
Merge branch 'bug/testsfail'