make things compile again and add test for diff