Fixes for SEQWARE-1444 and associated tests.