#include changes and added test images