Fixing sourceMap and tests.