Fix some tests and disable ones that won't work.