added single APICall execution + improved test coverage