adding more tests + rearranging