* Use direct service calls in tests instead of automation common * Remove automation common test helpers