Now using local calls in tests