Whoops, more testing code. I think I added all the helpers required. I'll make these go away.