Further renaming, and some more testcode.