Cleanup and test addition.