Removed busted API, added APIs, started tests.