Removed extra API and fixed tests.
Fixed typo.