restructure for testing setup & second course