Syntax changes + use eventually instead of sleeps in tests