[WIP] Hotfix/compari api test

Fixes various comparison issues