More tests; remove default datasources