Several changes

datasources changed
tests improved