Fix image helper and add specs