repair tests
add collection expressions