Removing imagemagickcompareutil stuff, and some code cleanup on tests