added module support and upgraded test suite