updates tests, additional 31.0 api work