Remove bootstrap, add test