Modify self tests for new -integration cli arg