Merge "Give error if test arg given without module arg." into nyc-dev