[UPDATE] Updated test suite
[MERGE] Fixing merge conflict