fix tests for manual cpi, disable do nothing tests