Updates for PR (in Nic's absence). Also a couple of basic tests.