Updated tests and boostrap
Fixed bootstrap