Fixing test cases [AMECHE-327]
Fixing test cases [AMECHE-327]