Fixing test
Removing change collection name support - beacuse it is too expensive