Mocks for arm done. Error handling improvements. Noticed inconsistent
behaviour of endpoints switches