refactor(satis): rearranging, adding tests