initial tests adaptation

reviewers: @uvizhe