Add two new tests and tidy up some old ones a little.