Improve collections mock