Merge "Refactor isoping and add unit tests."