Adding images & unit tests