Update images
Added available checking and other tests