Make order of testing (first test-npm and then test-unit) consistent with cgap-portal.
Make order of testing (first test-npm and then test-unit) consistent with cgap-portal.

4dn-dcic/fourfront,4dn-dcic/fourfront,4dn-dcic/fourfront,4dn-dcic/fourfront