Solved Test errors after adding Require.js

Also added order.js and resolved some inconsistencies