some refactoring
fixing nil doc
Force collection creation
More test added