Diff is complete and tests is green =D