Updated POJO's Picture, Producer and tests