test now uses 'Datasource' of package 'Model' as well