Added a match image class and test