Issue refs #1540: remove custom status model, fix code and tests
Issue refs #1540: rename statuses, update api-client, done