Started testing part 2

I probably should have started with the class and THEN done the
implementation, because my magical behaviors that seemed so natural
before now seem crazy. I'll probably have to start again.