Add tests of more functions.
Rename functions.