Extracted any logic that may need to be tested from the api class

Extracted any logic that may need to be tested from the api class #414