renamed test folder
reverted bootstrap back to old method