hack bootstrap, fix test