Update on functions and tests.