Update tests
make function arguments more explicit