Avoid shims from browserify.
Minor refactoring of tests.
Test browserifyed.