Add autoloading
Reduce the autoload functionality
fixing conflict in Collection test