- add unit tests to cover some of the changed functionality
- fix broken datasource unit test