Cleanup.
Do merge.
Come back, test_helper.