Merge "Add base classes for image tests."