More requirejs upgrade changes: all changes to setup.js also need to be applied to testsetup.js!