Moved over all collection tests and retagged them