Adding source map support to tests
Merge branch 'master' into express