Merge "Modified the API to make coverage test possible" into nyc-dev