Migration notes
Resolving README.md conflict
Updating new tests to match recent cleanup.