Fixed tests and conditional waiter throws exception after timeout