Added ability to tag and remove images

Prefer assertThat(message, value, is(expected));