Merge "Fix test that was failing due to a cast error."