Cleanup deprectaed API from tests