More functions, more tests.