Add the multiTest suite; minor test fixes