Updates definitions and tests according to 3.6.0 changes.