More pruning of test content
Change names and comment out content