Updated tests to pass against pre-3.6 API.