reorganizing modules to have isolated tests