Simplify tuple.

See #838

Signed-off-by: K-ballo <k@fusionfenix.com>
Added tuple tests.

See #837

Signed-off-by: K-ballo <k@fusionfenix.com>