Improvements for image validation, add /usr conflict test