Fix varbinary-related test failures