Some tests and a rename.