Add splitting of hands and more tests