Minor improvements in test commons.