Fix for test cases with new functions