Cleanup after merging pull request
More cleanup, fix formatting of tests
Fix bootstrap