clean_up control tests
add config defines and clean_up modules