refactor servlet paths
improve mocha test name
refactor servlet paths