1. Fix test-case.
2. Changed configuration of datasource.