Extended function signature and tests.