Adjustments for CI and to get proper test suite given logic