Made statics used in tests public.