Improve tests slightly.