Reworked some tests to hopefully resolve the No Table scan issue in CI