Refactor to expose non monkeypatched API
use bundler
include test framework