added case changing to NameHelper.js
fixed a merge conflict, missing require
Fixed missing include, and missing path in test