Added right length for message in unicast test
Implement options in perpare