Revamps autoloading and first generating test