Fixing few API V2 functional tests