updated tests for new function convention