Moved Topic.sh to test; Minor changes