TODO: make tests useful tomorrow