Fixes for the bootstrap test