Uncommit local changes, fix tests, reduce diff