Fix style related tests and do 1st 6th week assingment