Simplify tests.
Fix logic.
Add list images task.