Makes Autoload and Log conform to unit tests