Cleanup and test added.