Merge pull request #2 from smichr/isolve

variable name changes and remove comment in test
fix test and revert collecting intervals