Clean up and test rate counter