New tests to data source added.
ES5 shim refactoring.