Replaced custom wait methods with waitFor and waitForAssert

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>