Moved test into module.  Removed dependencies on other ren- modules.