Collection test improvements.