Fixes and skip some tests.