Fixed bug in bootstrap that was interfering with testing