Topic Clean up and, added test