Delete deprecated test and add more types of data