Fixed unit tests for Autoforward