Q: changed overload orders to fixes tests

Now resolves.