Fix for tests with multi-inserts and GBY-RS-GBY