Clean up Collapse Test to increase readability.