moved test modules to functional namespace