Fix test suite: take 2