So far every test has passed. So Im fine closing this up.
Just wanted to thank you both @mccollam & @imrehg for bearing with me and helping us through this. Much appreciated.