More fixes for bootstrap test
Merge pull request #297 from whirm/bootstrap_test_fix

More fixes for bootstrap test