Move autoload entries for test to TestAutoloadClasses key Change-Id: Ie705db0e7225600b7b498cfa134733a65f1ae1c9