Merge "Improve organization of TestsAutoLoader"