incomplete tests
implemented bootstrap
merge fix