Changed: fix ImageElement and add ImageElementTest