Test all the things!

I managed to stuff up the merge commit messages, oh well.