Clean bootstrap, add more tests