TODO: Reduce the number of test controllers we use