Added in necessary code to pass the Schema --name through, but commented out until pre-existing broken tests are fixed.