Refactored tets; now using @Inject
Added Notification when files get delelted. Tests gives NPE, Mockito doesn't set proper values on Mock.
Merge remote-tracking branch 'origin/story-2'