Merge "Ensure package-wide test init is done with testr"