Better testing data and annotations