Some tests fixed. But messy! [skip ci]