Clean up code in xpub-xsub test

quick edits to comments and unsubscribe timeout