Topic Clean up and, added test
Merge pull request #2103 from Danny-Hazelcast/TopicTest1

Topic Clean up and, added test