Communication Layer Test fixes.

Refactored pre_commmunication_layer tests to match recent changes/fixes.