Fixing bugs in LocatePicturesWithMap + adding tests to the clss