diff --git a/test/case/ietf_interfaces/dual_bridge/dual_bridge.adoc b/test/case/ietf_interfaces/dual_bridge/dual_bridge.adoc
new file mode 100644
index 00000000..00d08f40
--- /dev/null
+++ b/test/case/ietf_interfaces/dual_bridge/dual_bridge.adoc
@@ -0,0 +1,30 @@
+=== Dual bridges on one device
+==== Description
+Verify that it is possible to ping through a bridge to another bridge via VETH interfaces.
+
+....
+ PING -->     br0             br1 10.0.0.2
+             /   \              /
+PC - target:data  veth0a - veth0b
+....
+
+==== Topology
+ifdef::topdoc[]
+image::{topdoc}../../test/case/ietf_interfaces/dual_bridge/topology.svg[Dual bridges on one device topology]
+endif::topdoc[]
+ifndef::topdoc[]
+ifdef::testgroup[]
+image::dual_bridge/topology.svg[Dual bridges on one device topology]
+endif::testgroup[]
+ifndef::testgroup[]
+image::topology.svg[Dual bridges on one device topology]
+endif::testgroup[]
+endif::topdoc[]
+==== Test sequence
+. Set up topology and attach to target DUTs
+. Configure two bridges linked and a veth pair
+. Verify ping from host:data to 10.0.0.2
+
+
+<<<
+
diff --git a/test/case/ietf_interfaces/tunnel_bridged/gretap_bridged.adoc b/test/case/ietf_interfaces/tunnel_bridged/gretap_bridged.adoc
index 1d3b1594..8b24dc12 100644
--- a/test/case/ietf_interfaces/tunnel_bridged/gretap_bridged.adoc
+++ b/test/case/ietf_interfaces/tunnel_bridged/gretap_bridged.adoc
@@ -1,6 +1,6 @@
 === GRETAP bridged with physical interface
 ==== Description
-Undefined
+Test that gretap works as it should and that it possible to bridge it.
 
 ==== Topology
 ifdef::topdoc[]
diff --git a/test/case/ietf_interfaces/tunnel_bridged/vxlan_bridged.adoc b/test/case/ietf_interfaces/tunnel_bridged/vxlan_bridged.adoc
index 7d20a7dd..92647592 100644
--- a/test/case/ietf_interfaces/tunnel_bridged/vxlan_bridged.adoc
+++ b/test/case/ietf_interfaces/tunnel_bridged/vxlan_bridged.adoc
@@ -1,6 +1,6 @@
 === VXLAN bridged with physical interface
 ==== Description
-Undefined
+Test that vxlan works as it should and that it possible to bridge it.
 
 ==== Topology
 ifdef::topdoc[]
diff --git a/test/case/ietf_interfaces/verify_all_interface_types/verify_all_interface_types.adoc b/test/case/ietf_interfaces/verify_all_interface_types/verify_all_interface_types.adoc
index 5563a925..298a3bec 100644
--- a/test/case/ietf_interfaces/verify_all_interface_types/verify_all_interface_types.adoc
+++ b/test/case/ietf_interfaces/verify_all_interface_types/verify_all_interface_types.adoc
@@ -33,11 +33,15 @@ endif::topdoc[]
 . Configure VETH pair
 . Configure bridge br-D and associated interfaces
 . Configure br-Q and associated interfaces
+. Configure GRE Tunnels
+. Configure VxLAN Tunnels
 . Verify interface 'lo' is of type loopback
 . Verify interfaces 'ethX' and 'ethQ' are of type 'ethernet' (or etherlike if running Qemu)
 . Verify interfaces 'br-0', 'br-X', 'br-D' and 'br-Q' are of type 'bridge'
 . Verify interfaces 'veth0a' and 'veth0b' are of type 'veth'
 . Verify interfaces 'veth0a.20', 'ethQ.10', 'ethX.30', 'ethQ.10' and 'br-Q.40' are of type 'vlan'
+. Verify GRE interfaces 'gre-v4', 'gre-v6', 'gretap-v4' and 'gretap-v6'
+. Verify VxLAN interfaces 'vxlan-v4' and 'vxlan-v6'
 
 
 <<<
diff --git a/test/case/infix_services/ssh_key_authentication/ssh_key_authentication.adoc b/test/case/infix_services/ssh_key_authentication/ssh_key_authentication.adoc
index 04ffc9b0..b5c664b1 100644
--- a/test/case/infix_services/ssh_key_authentication/ssh_key_authentication.adoc
+++ b/test/case/infix_services/ssh_key_authentication/ssh_key_authentication.adoc
@@ -17,6 +17,7 @@ endif::topdoc[]
 ==== Test sequence
 . Connect to the target device
 . Create a guest user on the target device
+. Wait until SSH server is ready to accept connections
 . Write private key to a temporary file
 . Verify it is possible to fetch syslog data using public key
 
diff --git a/test/case/infix_services/ssh_server_config/ssh_server_config.adoc b/test/case/infix_services/ssh_server_config/ssh_server_config.adoc
index 782d8137..ed0f3b7f 100644
--- a/test/case/infix_services/ssh_server_config/ssh_server_config.adoc
+++ b/test/case/infix_services/ssh_server_config/ssh_server_config.adoc
@@ -20,6 +20,7 @@ endif::topdoc[]
 ==== Test sequence
 . Setup topology and attach to the target
 . Configure SSH server
+. Wait until SSH server is ready to accept connections
 . Verify SSH public keys
 . Verify it is not possible to access SSH on other IP address
 . Disable SSH server
diff --git a/test/case/use_case/ospf_container/ospf_container.adoc b/test/case/use_case/ospf_container/ospf_container.adoc
index 09c9a60b..c6661941 100644
--- a/test/case/use_case/ospf_container/ospf_container.adoc
+++ b/test/case/use_case/ospf_container/ospf_container.adoc
@@ -10,7 +10,7 @@ PC, which can act as a link breaker.
 .Use-case overview.
 [#img-overview]
 ifdef::topdoc[]
-image::{topdoc}../../test/case/use_case/ospf_container/overview.svg[]
+image::../../test/case/use_case/ospf_container/overview.svg[]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
@@ -51,7 +51,7 @@ second bridge, `br1`, only use IPv6 link-local addresses.
 .Internal network setup, here router R1 on subnet 10.1.1.1/24.
 [#img-setup]
 ifdef::topdoc[]
-image::{topdoc}../../test/case/use_case/ospf_container/internal-network.svg[Internal networks]
+image::../../test/case/use_case/ospf_container/internal-network.svg[Internal networks]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]