More updates to tests, api, etc