Fix and unskip tests.