Added test modules for Main and Base