fix tests - increase timeout and add waits