cleaning up certain things; pca tests are asserting names and keys propagation