Complete bidirectional tests

Change-Id: I8ec6cfcafcecde42989629ae12d0de7d0b2dbf02