fix in tests
import error catcher
minor changes