This improves the testing and other tooling and thus allows us to fix
some annoyances. (These fixes will follow in subsequent commits)