Several useful commits, including making the test suite work.