Refactor.
Refactor.
Add Tuple Tests.