Update tests and batteries to new result API