got branches with less code to speed up tests