Verified the test with the changes you suggested and it works without my fix. Thanks @rkorytkowski.