Adjustments, tests
Finally finished diffing