autoloading-fixes for testing