Improve autoloading and tests code + split interface