Move TestSetBuilder to separate module