Update tests for the new APIs