Valera/video jasmine tests improvements

Do not merge.