Add collection load test
Merge branch 'master' into collection-rerender-failing-test

Conflicts:
	test/src/collection.js