Chaning how tests is loaded and changing activation test