pull in nikit's tests