More tests

Okay, I am going to try to skip this packet, and try a different
packet. First, I will clean up some code, to make my life easier.