NAWQAAN-376

- More test coverage
- Changed nar properties to point to the general NAR webservices (versus
just to download service)