fix Collections
some tests