Test fixes to account for data-main and requirejs