Added more local test resources, error checking