merging squish testing modifications