Fix some broken tests, add Tuple test