rename instances of instance in fixturebuilder to datasource
fix failing users controller spec; cleanup oracle data source fixture