fix tests for #387
adjust to new model (no Error) for #387
fix #387