Fix func tests
Fix func tests