fixed client tests after merge
Merge branch 'restructure' of github.com:unepwcmc/NRT into restructure