Modify server to make it easier to test
Include test script in package.json