make sure -mod suffix is requested first, and fix test