fix tests, add bootstrap