simplifying diff done, simplifying tests in progress