update error scenarios and make them more reliable