another attempt at removing dist_test