Potential fix to problem with overload resolution in some tests