Fixed some tests, started ch7.