Fixed collections import
Tweaks
Test