enhance cpi tests for aws plugin and error message