Refact calls for easier testing