Tests ready
Fixed bootstrap