Improve various tests.