CHANGED scope of imported dependencies from test to default compile value as DiffUtil resides now in the main trunk instead of the test trunk. Also changed one of a try-finally block to a try-with-resource block