Improved gulp server test setup.

This should fix issues where watching tests via `gulp test:server` quits after the first run.