week 3 tests fixed after manual merging
week 4 solutions adopted after merging