Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.
why use jQuery here, if we use $ everywhere else?