Test bootstrap
Patched up the helper and added a test