Use autoloading for test classes

Change-Id: Ic6341ab4ef1af17e29eaaad4544c267af2f5a507
Merge "Use autoloading for test classes"