Updated TODO. Randomized fixtures slightly.