New tests and updated APIs