Add Tuple Tests.
Refactor.
Refactor.
Refactor.