Performance improvements
Fixed function name of test