More build twiddles, additional semi-useless test.