Modify self tests for new -integration cli arg
Add test of rescaled reduced integration