Remove duplication
[api] Fix failing specs