Merge sjinks:tests