Fixed increment of ids
Fixed unit test
Merge pull request #939 from ScreenDriver/contentResolver

Fixed increment of ids