Test module

Actually, I think this is the better one to merge.  Please disregard the development PR.