fix tests to use reusable function names