Fixed broken tests; added TODOs surrounding timeouts.
Making roles explicit--IInternalMessages are never published to the wire.