Minor improvements in tests