remove unnecessary wrapping of test functions in anonymous functions