More changes to structure for testing docs