I was able to resolve a similar issue by using code like this. I would give that a quick try - let us know if it works. If not, I will see if I can run your code and get it to pass. There’s been a few issues involving that test, so it will probably need to be changes to be more lenient.