Change how tests are bootstrapped and add new tests