Reduced image size, added some tests