Fix some unit tests, ignore others