Fix collection tests