changed tests - should rebuild tuple properly