Fixed a bug in bootstrap. Updated tests