Fix bootstrap race issue and related test
Update to v0.0.1