Refactor out normalized image class, add image compare test macro