Merge "Fix test failures due to bad cast"