Clean up and unit test addition