Fixed new test function signatures