fixed module naming
clean up test shit