Port Theme controller tests to bluebird
Merge branch 'master' of github.com:unepwcmc/NRT