Clearing up the tea testing confusion (with updates)