Use locator for shape file workspace factory (part 2): Tests have been corrected.