Fixing tests failures caused by switching to WAME 3.0