moved test modules to proper place