Moved some of the more specialized collections into their own namespaces and changed tests accordingly.