CommonJS
Fixing Tests & Uglify