Added API Coverage and added missing test coverage