VID-1308 more fixes for unit tests and title duplication
VID-1308 unit tests are passing
VID-1308 comment