clean up tuple and remove some tests