ds: more testing preparation