Fix for pointer to reference issue
Try to fix unstable finder tests