Update tests to use good custom function