Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.
why put this code in app.js if we extract all the other code into helper files?