Refactoring of Collection Spec

Parts of the collection spec are really old. I see that I learned a lot
from back then. This should bring everything up to speed.