Fix ByHand tests to work with 7.6.3 (empty cases)