Merge "Remove require_once from some tests by adding classes to TestsAutoLoader"