bootstrap integration complete
fixing tests
labels fixed
test mismatch fixed
fixed capitalization errors
fixed more tests