Change test base class as current is deprecated