AqmpHandler test fixes