bugfixes in test bootstrap