Cleanup debugging and testing exercises