Rename modules
 Added a test helper