adde proper bootstrapping to tests