merge tests  #1