minor refactoring
changed two method names
added tests for imageview