additional fixes for paper, long integration tests, and possibility to specify error model as a function instead of a class