Code coverage now only covers source files
Refactoring Apis to use Api::_request