restructure test module for consistency