Improve tests a bit.