bugid-93724 | WAM Api - unit tests + bugfix