Bugfix: split image-name in correct manner + added test