Done + added new tests for the new APIs.