Enhance tests + add stripVersion flag.
Small changes.