fixed pubsub message conversion
more tests..