Allow multiple image types.
Test refactor.
Rename methods