Changes for Mocha & RequireJS

Signed-off-by: Bogdan Bivolaru <osbiv@yahoo.com>