style corrected, course test modularity update