Added more diff tests
Separated diff into own file. Added more diff tests.