Make build and test a bit more paradigmatic.