tests for new modules, fixed a couple name collisions