Merge "Move method to its using test class rather then having a public static thing...