changed datasource setup, removed skip