This is a good idea.  Not only does it get rid of the weird @staticmethod stuff, but it also will break up the test code.  Changed with fd23341bc53dc021e57ad4bf143d9d903ca05ef3