Added test to photoview and albumview.
Solving merge conflicts.
Modified tests images view test to fix errors.