Remove dead variable from server shutdown, improve testing shutdown.
Clean up Grunt test tasks to reflect new test structure.