Fixing autoloads for testing