Fixed some tests, marked remaining.