Simplified var names, added tests.

- replaced underscore require with require('underscore')._ to force
Intellij to code-complete the _ ref
-