Fixed function test failures