Moving stuff around, starting second week and parametrizing the hell out of pytest