Rollup of all pull requests

I also aim to fix all tests.