Fixed home/constraints for multi-image.
Unit test fixes.