added new tests
fixed retrier problems