remove obsolete code
add test for normalizedImageName
make integrative test build work