Merge "Revert "Make AbstractTest as static class"" into stable/magnesium