WAPI-11086 added some methods with tests